Test suite first pass. Squashed a match(";") bug.