Restructuring and adding test data