Cleanups on test code/ gulp tasks