More fixes - make test.rb run