Getting back to my starting point where all of the tests pass.