Restructure the  Test Data