Added status validations and test