code review: clean up tests