Add a couple of tests for #7627