Fixed tests to new data format