Fix unit tests

ref #10