PLA-1381 removed mustSubMatchedRecords + fixed unit tests