Re-support running command tests with catalog version1