Add some more test cases to be sure we do the right thing in various cases.