Add tests, but Grunt test mocha is having problems. Later Fix