fix runtime extended tests
Merge pull request #2985 from danmcp/master

Fixing runtime extended tests