Expanded Deserialization unit tests
Code cleanup and documentation