more test fixes
more unit test fixes