New Testing Framework API

Changes to make use of new testing framework API.