Fixed #14334 -- Query comparision now check for object types.

breaking these up into smaller test methods with some comments about what case is being tested each time would be helpful