Fixed up tests.