updating for Ruby 1.9; need to convert to RSpec