Upgrade to new file type definition. Upgrade to Rspec 3