Fix testrunner.sh for new tests layout