Improving the test a bit