issue #96 update tests