test fixes
cleanup