#4137 Fix end to end tests