Updated for tests.