Added grunt watch to watch and rerun tests
Fix watch grunt task