Start initial watch right away - fixes timing issues in tests