Adding filtering options and updated spec files to support RSPEC 3.0+