update raise and tests