Fix CliTest
Merge branch 'develop'