Fixes, tests, Grunt setup
Added test.zip