Fixed up some stuff with the tests.