Tests for enhnanced auth & refactoring

Pull Request description

Put your PR description here instead of this sentence.

[ ] You have reviewed the guidelines document.
[ ] Labels that classify your pull request have been added.
[ ] The milestone is specified and corresponds to fix version.
[ ] Description references specific issue.
[ ] Description contains human-readable scope of changes.
[ ] Description contains brief notes about what needs to be added to the documentation.
[ ] No merge conflicts, commented blocks of code, code formatting issues.
[ ] Changes are backward compatible or upgrade script is provided.

[ ] Screenshots with affected component(s) are added. The best option is to provide 2 screens: before and after changes;
[ ] If you change the widget or other API, ensure it is backward-compatible or upgrade script is present.

[ ] Added corresponding unit and/or integration test(s). Provide written explanation in the PR description if you have failed to add tests.
[ ] If new dependency was added: the dependency tree is checked for conflicts.