Make even more tests runnable.