Merge "Fix broken tests" into sc-dev