Reviewed-by: sla, ctornqvi, lfoltan, mchung, alanb
Fixing unstable behaviour of 2 tests Reviewed-by: iignatyev
Reviewed-by: thartmann, twisti