Add fixtures for #1553
Add fixtures for #1233