Add fixtures for #1703
Add fixtures for #1684