Fix functional tests
Merge pull request #573 from gannetson/multiple-fixes

Fix functional tests