Merge "Fix unit tests to run on R" into sc-dev