unfudge two now-passing tests, lizmat++