Refactor out constants to lib
Refactor out module set up and teardown in tests
Refactor all Injector static methods to utils.
Remove all the unneeded comments.