minor simplification of unit tests