Changed how test data is saved

The test data is now saved in the correct order.