A bit better memory management, binding core providers tighter to integration tests