Unit test refactor
Merge branch 'master' of github.com:jamesagnew/hapi-fhir