Add multi object support and rspec tests