Fixed, now all of the tests pass!