added some mocking to defender
more mocks
and even more mocks