Update unit tests for issue #85