Upgraded to the new test-interface.