added tests for deserialization
fixed deserialization
added missing files for prev commit