updated testing (working now) and gulpfile.js