Initial support for the new testing framework