Add test for custom keys
Version bump to 2.7.0. Update CHANGELOG.