Corrected Data.java; passes test even with multiple re-partitionings