Make 'make test' pass

Change-Id: I2f5414d9ea088f2f88cf983855807595e27c767e
Merge "Make 'make test' pass"