Add better watch files for watch end2end tests