small fix
add test fixes
small test fixes