Removed TODOs
Grunt test