Upgrades, fixed asserts for methods calling

There were a lot bugs with wrong
usage of mock library, where
we were trying to make sure
that method was running

Change-Id: I00d664be6ca9ceb846dca60da03bf3c1c3ba56ac
Merge "Upgrades, fixed asserts for methods calling"