Tests for #91 fix