Added status validations and tests