Fix Unit tests

Fixes: #29