Fix of some failing endtoend tests