Improve test coverage for logout
Shuffle things around a bit, neater this way