fix merge conflicts
remove requests tests:
refactor tests in user spec