adding StringUtils class, updating JUnit tests