Modifed testrun.py to handle builders (working to implement #3)