All tests pass, finally