Fix broken tests

Test: test
Change-Id: I754d84b6826efc2f2357557d0b39f56b6702b711
4 files changed