Tests for #1654