more changes to test.py
fixed final merge conflicts