Fix failing specs

* Update to use expect syntax
* Use vcr options