Tests for issues #355 and #424