Merge local changes + added test_thr.py script