Move into a service and add back the test module

Vinicius Pereirarequested to merge
issue/drupal-2107455:10.3.x into 10.3.x

Merge request reports