clean up
fix tests