fix test, cleanup