Add Status Validation and Tests