More Gulp test fixes.