Fixed up the tests