[Mason] Refac. Skipped tests in SPMO