Inject some Mocks in tests

Change-Id: I47ec0b6e299b5ebb3899a6ba9a14f96447a60668
Merge "Inject some Mocks in tests"