More updated tests.