updated rspec including TODO's
Merge pull request #4 from klappy/rspec_tests

updated rspec including TODO's