Fixing breaking tests
Fixing onLogout
Merge branch 'digest'