Upgrade to new style of file type definition. Upgrade to rspec 3