Add status validations and tests