Fix tests for compositeId suffix.