Fixes test errors

 Bug: 3248213
 Fixes errors in the tests that were caused by missing files, proguard,
 and the refactor.

Change-Id: I503dfc7ee42d0173e3a5ad032f58a6f4f310588c
5 files changed