Couple more Service module test fixes, status now Tests run: 98, Failures: 7, Errors: 15, Skipped: 3.