update to rspec 1 and use some of the new matchers