Fix test errors
Keep clean
Add signin-out