Improve tests
Injector support