fixed bad test practice (thanks Emily), some cleanup