Feature: Refactor and test sc review

### Problem/Opportunity

Sc review is next to be released. We need to refactor for testability and then add tests for sc review.

### Proposed Solution

Refactor and test sc review.

### Acceptance Criteria (Optional)

_No response_

### Additional Notes (Optional)

_No response_