Refracting name change
Removing url arg to separate module
Adding client unit test
Grunt spacing fix