Surface water rules are also ignored in tests
JMP import now depends on population data
Update vendors via composer