Todo

  - Fix and extend unit tests.
