added more tests
fixed grunt test, removed midway, updated Gruntfile