Corrected some problems with the package.json, ported tests to the grunt
file