[TASK] Clean-up TestDataCommand