Further unit test refinements