Change test suit to RSpec2 sytax