Changed some stuff with the test-run programs