Minor improvements to unit testing