Fix and test chat