Fixed up the tests.