Avoiding static method -> change to Service. Fix test.