Tightened test matcher