Small fix in the match routine. Fleshing out the test world