removed inconsistent error descriptions, fixed slow suite running