Added expected length values.
Misc cleanup.
Added test for unmatched number.