Working test - migrating to factory from controlle
Making better user of the injector for testing.
Simplified the tests.
Cleaning up