minor test case changes
Merge branch 'dev'