Fixed failing test
Merge branch 'hotfix/FixDebugTest'