Updated to reflect benchmark/suite changes, setup/teardown changes