Fix unit tests. [finishes #63795758]