[TASK] Clean-up TestDataCommandController