Fill out more unit tests