some test fixes
merge