Fixed grunt test issues