Post-merge fixes.
connected components test case with 2 joins with the solution set
Migrated tests to TestBase2 (for stabilty)