Redo tests to reflect refactor
Prep Gulp tasks for CI