Test fix
CS
Merge branch 'hotfix/unit_test_fix'