upgraded rspec and fixed Factory Girl deprecated instances