Fix tests that break on Wildfly

These tests are more generally robust as a result.
Merge pull request #588 from zanata/fix-ftest-wildfly

Fix tests that break on Wildfly