fixed up the tests to work with