Add test for issues #55 and #9