improved the tests