Thought some more about the unit tests