make functional test more robust
Merge pull request #167 from zanata/fix-functional-test

make functional test more robust