Fix the scs and test.