Added tests for new logout scheme