Restructure test data.