Replace trait magic by service call, tests refactored