Maybe you can think of the match as a tiered match as follows:
Deferrals between 0-5% get 0% match
Deferrals 5% and above get 7% match
Then you would test the match in the ACP test, and in addition you would need Benefits Rights and Features test to deal with tiers of the match.