Merge remote-tracking branch 'upstream/develop' into task/add_auth_tests
add unit tests
fix according to comments
fix merge conflicts
comments
Merge remote-tracking branch 'upstream/develop' into task/add_auth_tests
fix according to comments
Merge pull request #123 from alberts-tid/task/add_auth_tests

Task/add auth tests