Parser

 - serialize(...) and deserialize(...) methods refactored
 - more parser tests
 - fixes in parser tests