Bugfixes
Simplified Grunt tasks
Added tests