Key is now a polymorphic serializable type. Added test files that were missing from the repository.