Add Test and Statistic tables, and appropriate classes