Convert some more tests.