RF-13582, 13614: fix test dependencies