Making the test better