Cleaning up tests from day2 per Brooke's notes/advice