Add test case for Issue #37