Merge pull request #97 from johngatti/master

Unit tests, integration tests and some fixes to code based on tests
Update toolkit and integrations template to Java SDJ 1.13.0
Merge pull request #98 from bhewett/master

Update toolkit and integrations template to Java SDJ 1.13.0
conflict resolution