Feature/rspec

passing a block to `and_return` has been deprecated and was subsequently removed in rspec 3.0

I'll let you `git merge --squash` if you want this, rather than rebasing a pushed branch