Build mp test without (unneeded) PBF support, improve test checks
Sort segments differently.