Fix tests

2e8ac9c4847 broke some tests (at least, for me locally). This fixes them.