All tests passed, but they need to be completely rewritten