cleanup
fix tests