Fixing the unit tests for issue #157.