modified the tests to better work