fixed failing tests for DI