Add test for issue #35