Merge "Unit test fixes." into sc-dev