Return hash instead of object
replace test/unit with rspec