Remove double definition of signin and signout
Rename some test for a more accurate description
Tests: more meaningful names for a few variables