WIP: tests for #2151