Added compatibility with new tests.