Merge "Add function to test user messages query by timestamp"