[Mason] Adding SPTest fixes