Fix specs, cassettes and methods