Now tests pass