Modified some tests.