HM/TJ: refactored FieldFactory to FieldRegistry.
HM/TJ: integrationtest works again with FieldRegistry.