Added tests to test issue #155, passes close #155