Tests for #131