Add tests for Issue #1 and Issue #3