Made test data format more logical