Fix test names and error messages