Ongoing test matrix changes

Attempt to fix the excludes that didn't get excluded
Start to address problems with ruby 1.8 in the test runner