Address more issues with ruby 1.8 test running