cleanup test, incorporated feedback from review