fix the tests to use the token_auth parameter correctly
another fix based on the previous fix
Merge branch 'master' into py3