test fix
more test fixes
better fix attempt