Removed unneeded assertions
Removed unneeded mocks