CONN-560: unit tests and code fixes.
CONN-560: adding regression suite.
CONN-560: rework of solution logic, and regression suite.
Merge pull request #573 from msweaver/CONN-560

Conn 560