Some more test fixes
test fixes