Reorganize imports
Check if auth info will be stored
Merge pull request #93 from akkie/master

Some test improvements