Refactored injections for better testing

* tests override methods now
* tests injections