Search headers from the PWD. Fix the new runtime test for the
scripts version.