Fix broken tests

Test: npm run test:all
Change-Id: I6f064dc8846b2e65dfb002d002aee80d8422c537
6 files changed