For ENG-5256, fix more broken partitioning in tests