improve tests
Merge branch 'master' of github.com:fhirbase/fhirbase