Get more script engine tests turned back on.
Merge remote-tracking branch 'origin/master'