Fix tests & use rubyspecs