jeddy3 Refactor requires of custom syntaxes in tests (#5896)