Merge "Increase parsing comparison test timeouts"