working on the tests a bit