Fixing unit tests.

The unit tests are fixed according to the patch for the issue #60.