Made end-to-end pipeline test more robust