Fixing the Use Case 1 services and tests