aligned tests and model to latest chages. see geosolutions-it/crop-information-portal#73