Bringing in test name fix
Merge branch 'dev' into test-name-fix
Merge pull request #2004 from christav/test-name-fix

Test name fix