Fix subpipeline and related tests