2014-03-07 Fixed some TODOs and new test class