Adapts tests for cataog index