Misc. updates to gulp file & testing...