Refactoring and tests included beneath method to check against inject