Unit test updates
more unit test fixes
More unit test fixes