Fix unit test and add test for resolving issue #220