fixes
fixed the most of the tests