Some more updates for chat history testing purposes