#398: changed username with user
Fixed clean_return_path tests
Fixed tests