Add a few test cases to verify that the old behaviour does not break and
that new one behaves sanely.