Minor improvements to the unit tests