Attempt to fix service test