Resolve test failures
Merge pull request #108 from rossrowe/master

Resolved test failures in Java tests