Refactored logon/out BDD spec and tests to match