add test for And
and implementation
helper method added for logical plan modification, for external plan optimizer
bugfix for CollapsingAggregate
add distinct && countDistinct && tests