Added tests for Issue #130