- Move in correct package - Use 'timeout' where possible - Introduce AbstractChatIntegrationTest holding the chat managers