Add test for #777
Add #544, #777 to History