Fix test failures caused by refactor in commit 7ddca84

Change Ib14652e3 removed package names for some classes in tests where
it was needed.

Bug: N/A
Test: create tests
Change-Id: If7967b929b3afb16a741227cecd5c8d4703700a8
6 files changed