Merge "Fix tests in apex runtests.sh"