Use CMDQueryStringSerialization
fix broken tests