fixed first set of tests, almost fixed grunt watch tests