Updated Gruntfile
Updated tests
Updated load method