Add another login test
Make sure login text appears in the correct order, and refactor to event bus