Updated todo list.
Refactored test.
Replaced "throw" by error event.