more test fixes
fix outstanding tests!