Move test_runner.py functionality to client, Fixes