make the tests use the string constants
Merge branch 'constants-in-tests' into dev-gradle