Updated more tests.