changed test cases from master branch
Merge branch 'master' into testBranch
Merged from master branch