Test API fix

Missing commit that alters the test suite API for running tests.