Tweaks to comparison / record hunt in test utility