Adding tests, fix grunt file