More optdone regressions and unit test tidbits