Looks good. Can you add a test for the key order issue?