Added some support for guest user, begin Unit tests