Improve test and basic login. ##170