Fix cascades which fixes about 40 unit tests