Fix three more tests.