Fixed up all tests