Update test data
More schema fallout, city admin tweak