clean up and improve the test file