-add: Tests
-change: got rspec closer to working