Remove cultural-contact, refactor simple-test, add more pops
merge