add status validations and tests