added some tests for my tasks
removed some comments left for debugging
Merge remote-tracking branch 'upstream/devel'