Fix order in settig up test cases
Set Version
Merge branch 'hotfix/1.0.6'