refactory v2 rspec codes
refactory v2 rspec codes
refactory v2 spec codes