cleaning DataTable and Composite tests (WIP)