All tests now pass (hooray!)