Add fixtures for #1721
Add fixtures for #1227