Now all unit tests pass