Convert more tests to unittest.