Raise exception when saving invalid entity

... unless outputting as JSON

Remove references to and_call_original which is broken until
Rspec 3.0.RC1 (https://github.com/rspec/rspec-mocks/pull/649)