pushing changes to 3.py and testing.py

* minor adjustments/improvements