Minor unit test fixes