Make the catalog tests more reliable

At the moment they can fail if you use "testr run" directly
as the current directory is different to that when tox is run.

Change-Id: Ia5b4b02d400f2e1bc0d765ea329493e952f564e6
Merge "Make the catalog tests more reliable"