Some more unit test fixes