Resolve unit test failures, fixes #21