clean up watch_tests script
Rename the helper scripts
remove excess line breaks