Jeff - found a way to properly test injections
Jeff - refactor mock injection to its own class
Jeff - refactor mock injection to its own class
Jeff - merge conflict