Use single setting name
Add test cases for zipping galleries