Patch/optimize testing