improvments to the test