Cope better with missing Pred files
New state matching test MatchHeap