Fixed failing specs
Fixed rspec deprecations