Add test case related to #17
Merge commit '51349a17a0d3306cbb4d9aa24999f7a6821c0e63'