All tests pass, still need to make changes recommended in test messages