------
 TODO
------

Although the tests gives a relatively good coverage, they need to be
rewritten in order to suck less.

