some fixed to query classifier tests