ConditionalJoin expressions and tests

Cleaned up filter generation