Removed duplicated code from stateful02. Extended existing parsers.

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