scoping enchancements in h2o.exec (fix a few tests)