Make unit tests working again

Closes #10 issue