Use expect syntax for mock instead of should syntax
Merge branch 'feature/rspec3' into develop