Fixed canonical query tests