Update test.py
more changes in test.py
more changes in test.py
resolved conflicts