Minor improvements to unit tests