Refactored tests to include DI with Castle