Tests for PR 487

Trigger Travis for fixed/new tests.