Add status Validation and tests