Re-jigged injector module. Added injector tests.