Test fixes
Adding mocks to test
Removing unnecessary code added to users to be able to test them since mocking takes care of that