fixed gulp test and watch targets