Merge pull request #67 from intportg/dev

[NEW] Add tests on DefinitionCollection and DefinitionKey.