Fixes for some functional tests
Merge pull request #1823 from SoftwareDev/git

Fixes for some functional tests