modified test.py
merged jordans and my changes to test.py