improved the tests.