some more unit test adjustments