Merge "Migrate final system tests" into sc-dev