Add statuse validations and test