Add status validations an tests