Reorganize test data #441