Update tests to manage latests catalogue changes