Additional unit test fixes