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