fix tests
fix cleanup