Aligned SCR2 with tests.