Fixes to meet rspec standards, adds dup