Fix tests that need additional injection