cleanup & fix test