GATEWAY-3351: code updated and unit tests fixed.
GATEWAY-3351: updates for formatting per CR comments.
GATEWAY-3351: updates for formatting per CR comments -update.
Merge pull request #326 from msweaver/GATEWAY-3351

GATEWAY-3351: code updated and unit tests fixed.