Fix unit tests for commit 2209ba3