small unit test fixes