Added status validations and unit tests