working on some of the tests