restructured testdata to work with hierarchy