polish up the test suite and make it more efficient