Added few tests. Simplified grunt watch task