The cmp_key method dies on undef

- Updated tests accordingly.

- Updated Changes accordingly.

- Also updated Changes with missing change from previous commit.