Fixed incorrect functional test
Merge remote-tracking branch 'origin/pr/357'