Fixed up tests: