Changed the name and added functional tests and made the dependency injection work.