[FIX] Fixed flake errors

Due to the outage of jenkins a few reviews have been merged manually
which contained minor flake errors.

Change-Id: Ibded765a863b36a185258acff3e32de75ff4a58d