Fix failing tests, update to modern rspec expect() syntax, use filters instead of commenting out broken specs.