ticket:5 Added tests for auth, fixed auth
ticket:5 Merge commit Added tests for auth, fixed auth