Add test for Twitter sign-in
Resolve schema merge conflict