[TASK] Clean-Up TestdataCommand