Continued work on DefaultUnifiedRepository testing with mocks