Update tests and interfaces
Add some tests for the dependency injection