Changing data structures;
Change test data script to use bucket-type|schema named 't'