[Mason] Fixed several more full test breaks