Change test to use id matching for composite override