Fix more UG Service module tests, status now Tests run: 98, Failures: 5, Errors: 10, Skipped: 3.