updated with BusNetwork and tests