Issue #96 restored tests