Fixed messages test errors