Merge "Choose parentids in tests as they are in real dumps"