Remove ambiguity in stubbed methods in spec_helper

- Adjust the stubs in spec/spec_helper.rb to specify the appropriate
  number of expected variables
- Add parenthensis around return values

Change-Id: Id92fbfad0433fcdcbe0ab6909a0b717d614ac62c
Partial-Bug: #1271535