add test for OverLapRight
add tests for OverLapRight + refactorings