Restructured test data to multiple bundles