Fix broken tests

Test: robo tests
Fixes: 130871450
Change-Id: If7b01147f5680392c7635f3a3b4e558aa56a633e
8 files changed