Two more test fixes.

Stuff I screwed up when consolidating the positive (i.e., expected pass) test
cases.