Should fix a few but not all tests.