Update error string and tests