Arel code prepared for rework to CQL

tests run without failures