more unit test refinements