fix all unit tests again