Add test for PR 818 (#822)