Following [CALCITE-2822] simplify test and related classes/rules

I accidentally pushed CALCITE-2822 without these changes. Apologies for
the multiple commits.
3 files changed