Update serialization definition
Fix properties call
Set initial simple test