Merge "Revert "Updated the test to adapt new inlined mocks""