Clean up repeated_id test a bit to test indirectly