Unfudge a couple of now-passing tests.