Fixing the 3 run-tests.py problems.