More injection cleanups/test improvements