Fixed up some failing tests.