fixed bad test practice (thanks Emily), some cleanup
added comment about method never returning null