Fix assertion messages in functional api
Merge pull request #4196 from pmorie/dev/fix-tests

Merged by openshift-bot