Updated normalize tests to cope with extra widen argument.
match-data-1 was failing on final match due to off-by-one error.