Updating spec with changes for isValid