Enough scaffolding to test new-style integrations