Refactor mock injections. Much easier