More work on e2e pipeline tests