Fix tests that accompany fixing bug 382.