Add fixtures for #1676
Add fixtures for #1728