fixed specs, fix deprecated warnings for rspec