Tests for #31