Fixed up some of the tests