Completed rspec tests