Add mocking for User
Solve conflicts