clean up 1-6 tests