Change structure in test