All tests fixed and passing