Fix unit tests for commit c47c512