* Fixed Some Typos * Removed global variable and updated tests Co-authored-by: nakulnambiar <nakul.nambiar@demandfarm.com>