fixed failing integration tests

Keith,

This request includes fix to failing integration tests.

Note: Still no clue about failing test case checkGroupFunctions() on cloud.

Regards
Ashok