Created and fixed the tests that were breaking