Merge "Fix tests/runtests.sh"