Fix compat issue in tests

Change-Id: Iab2079b98186b5028082002c0f000dbc93ec7793
Fix a bunch of class refs

Change-Id: I24052234de4438d9c5ddeba35f82119fa86d8141