Fix unit tests for commit aafba52