More injection, more tests, more functionality