Added test branch and altered traffic.py