Test fix
CS
Merge branch 'hotfix/unit_test_fix'
Merge remote-tracking branch 'origin/master' into feature/travis