Removed DI abbreviation, removed catch clause in test