Unit test fixes
merge