Slightly improved the tests