Adding rspec
Removing test:unit
Weird merge bug