adjustments for cqs unit / load test code
more cqs unit test refinements