(Hopefully) Fix remaining test failures.

This lumps together two unrelated changes, because Travis is slow enough already and I really want to know whether this approach works.