Make some more tests runnable.