Merge "Use of ng-mocks instead of stub"