Fixing missing service tests