more unit test fixes