Update the unit tests according to the issue #117.