Fix failing tests (Does not mean that they're testing the right thing)