Merge "Migrate additional system unit tests" into sc-dev