finished test wth a few bug fixes

test still faill