+shilpi: Fixed End2End tests