Add tests for #824
Add #824 to History