restructured test gulp tasks