Add integration test for #31
Add integration test for #31