BUG-611 : updated tests for serialization
- fixed few minor bugs

Change-Id: I92ac52865fa1b4c26884e73871244ea16697a834
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>