[TEST] Fixes to incorrect M4 schemas and member naming.