Getting rid of some mocking attempts that didn't work