Added Address type, fixed tests, changed deserializing function