small reorg of test so that debugger/coverage work locally
small reorg of test so that debugger/coverage work locally


Former-commit-id: d73ab7c93bdd827f0c9d6c9e959487409d23264a
SuperCowPowers/workbench,djtotten/workbench,djtotten/workbench,djtotten/workbench,SuperCowPowers/workbench,SuperCowPowers/workbench