Checkstyle brace fixed
Fixed tests as they tested old code
Merge pull request #166 from colinkho/master

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