Test names corrected, validation messages fixed