some unit test fixes