Add option to gulp test task
Cleanup variable definition code