Add test for Issue 66