Moving credentials saving to auth helper

see #245
Fix variable error

fixes #238
Prepare OC7 tests

see #244