Changed spec files to use spec_helper
Fixed rspec.