move to new testing API