Merge "Fix broken tests" into sc-v2-dev