same tests

do_and_form and do_or_form has annoying small technicalities that are
giving me the business. Kevin help pls