[TASK] Clean-up TestDataController Output