All the tests pass now :D