= fixes in tests and error messages