cleanup + fix test runner