DRILL-1631: Bump optiq version to r7
Add test case. Fix is in optiq.