remove changes to user/tests.py that are to be released from the origin/zoho_check_script branch