Fixed up failing tests.