Backport some patches from split_match branch
Remove junk accidentally added to matchtests