updated rspec tests to handle all cases brought up in conf call.
Merge pull request #5 from klappy/rspec_tests

updated rspec tests to handle all cases brought up in conf call.