BUG-584: tests update, removed use of deprecated elements.

Change-Id: I3416c8009cf1bbdcefee8042f570b4d407fc73a2
Signed-off-by: Martin Vitez <mvitez@cisco.com>