Add additional test for Query..or(), testing optimized or