Add Status validations and tests