Fix group job related test failures.
Merge "Fix group job related test failures." into develop