Update stencil tests for upstream stencil changes