BUG-731 : extracted parts of long methods to separate methods
- added test

Change-Id: I3e8eaf642d9dd9f9f14501455cc69d1f87a4801b
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Merge "BUG-731 : extracted parts of long methods to separate methods - added test"