Merge "Add additional predictor unit tests" into sc-dev