Update test data to match the latest changes in 1.10.x branch