Finished the tests, but still need to fix them