Clean and update tests
More tests

-Rewrite of Unit tests to actually test deserialization