misc unit test fixes