More fixes and better test coverage for bundles in FhirMarshal.