Merge v3 and v4 into v5 test-data