Fix deserizlize
Added Unit Tests