#12 Fix unit tests