cleanup
fix test