Regressions: fix some regression tests to accomodate optdone being a Boolean