Update to new test style