Fix unit tests for commit 9af6505