Enhance Cx tests for charging addresses