Removed function within a loop.
Consolidated two client test suite.