Add support for single sign on
Add support for single sign on tests & restructure