[Mason] Completed several more test cases