Unit test hotfix