Adjust tests to be used in 1.480.3

Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>