Implement and tweat tests to use Overlaps hack