Fix runtests.py after merge from master