Testing

Merged Jesse Phillips requested to merge testing into master

Refactor deserialization to allow testing.