Fix broken QueryParseTest due to error code cleanup