Updated rspec tests to include new functionality