- fixed the tests, and the code