Reorganize tests into unit/integration - better gulp support.