Unfudge some now-passing tests.