TST BUG: Don't hard-wire list of borough names