Testsuite refactoring & fixes

! Do not merge without @bstansberry 's ok !

this needs to pass on at least 10 PR runs