Fixing specs and upgrading ChefSpec/rspec