clean up test code: "unoptimised" code is no longer unoptimised