Port to new test framework