More tests for #788