Refactorin, more tests, allow chaining injectors