Fixing extended tests
Merge pull request #5029 from danmcp/master

Fixing extended tests