Yet more minor improvements to unit tests