Converted some tests to use SurfaceExtraction alg before SurfaceRenderer