fix gulp watch
update tests