Fixed Grunt task error, reorganized test files.

Fixed use of incorrect use of Grunt variable in task declaration. Removed
unused test folders, moved files to make the setup a bit simpler.