Adjusting the tests because the helpers are now ordered differently
Adjusting the tests because the helpers are now ordered differently

project-chip/zap,project-chip/zap,project-chip/zap,project-chip/zap