fixed various typos and variable name changes

tests/conftest.py

@@ -38,10 +38,10 @@ class AuthActions(object):
     def __init__(self, client):
         self._client = client
 
-    def login(self, username='test', password='test'):
+    def login(self, username='test', email='a@.c', password='test'):
         return self._client.post(
                 'auth/login',
-                data={'username': username, 'password': password}
+                data={'userid': username, 'email': email, 'password': password}
         )
 
     def logout(self):