Add new tests
Fix logout issue