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

Partial-Bug: #1271535
Change-Id: I11ea6503c37d60f555c52d80b68ee39e1ed95748