Fix majority of tests.