code review: safer test