Add status validations and test