Fix some additional tests.