Latests additions to tests, deprecate the catalog patches one as we just get rid of them :):)