Split out expectations in injecty spec
Refactored injecty code for better readability