Cleanup use of stencil view and use common test helpers