Merge pull request #1816 from SoftwareDev/git

Fixing tests
Merge pull request #1823 from SoftwareDev/git

Fixes for some functional tests