Change overlaps condition and rspec tests