Fix tests to match new error messages