Revert: "Paranoid: don't required non conditional queries"
Add test unit for required check