[Ronald] Some more unit test fixes