[v2.0]Fixed tests to work with strings in xml file + checkstyle edits

as above.

This should be the final v2.0 release