New API for the test suite