Fix logout test condition
Fix event integration test