Add a test for #36