SPChangeProcessor: Optimizing flows
Fixes Unit Tests build issues