Delete fixtures for #1116
Restore fixtures for #1116
Add fixtures for #1818

From https://gist.github.com/maer2712/d0247e9d121562a2f992/