Fix some tests

The Proguard changes broke a few

Change-Id: I7fb2caf7f9e3ceaf9fc14c54abf8a40d8d3ca9c1
2 files changed