All tests pass and fixed