Now passes all unit tests again.