Added class City and updated tests in bopmodel.py in demo1b