more unit test clean-up