fixed the tests!
now to improve them.