Consolidate logout into account, get unit tests back to passing but with not 100% coverage