Switched tests to use the new planner.
Rename setEstimatedCardinality to withEstimatedCardinality
Merge pull request #3162 from pontusmelke/change-tests-to-newplanner

[2.2] Change tests to use new planner