Add 2014 to copyright years.
Correct variable name in test (thanks Mahdi).
Refactor TODOs