fix test / cleanup