Non implemented sign-in changes - commiting so that I can pull latest
Resolve merge conflicts by changing some test modifications