Fix publish tests
Fix failing test
Merge pull request #13422 from cachedout/publish_tests

Fix publish tests