Added coverage
Correct grunt test
Corrected test and coverage code
Merge branch 'feature/coveralls' into develop