Fix unit tests following pull request 11.