More consistent error messages and tests thereof.