Rearranged mocks to get specs to pass.
Truncated trailing whitespace.