Tests for PR #478