fixing unit tests related to issue 80 fix
Merge pull request #116 from Hainish/feature/issue80

Fixes unit tests, which were broken by #113 to fix #80.