Adding filtering options and updates spec files to support RSPEC 3.0