cleaning up tests per code review