fix the tests so they're not asserting wrong behaviour
fix activerecord's completely broken where clause merge semantics