Updated for new tests.