Add test for #630

[richelbilderbeek]

I am going to bypass review, as I feel we have too few tests. Let's see if I regret this :-)