Rework the bench to use the test setup

Also use whysoslow.