Update to reflect new test framework.