Removed duplicated code from stateful07.
Extended existing parsers.

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